Bug 667759 - gtkdnd-quartz.c is missing annotations for introspection

Work around this by introspecting gtkclipboard.c and gtkdnd.c instead
of the quartz alternatives.

Note that this is temporary: The implementation of GdkSelection
will make the quartz alternatives unnecessary. See bug 571582.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a726377f185acfed8b40b6594777f0b7ec594835..dafebe6e06ed30aa84d182c9e11bbcb10e08116c 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1308,13 +1308,24 @@ LDADDS =                                                                \
        $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
+# The Quartz clipboard and dnd files aren't annotated for
+# introspection. Rather than copy the annotations over from the
+# regular files, exclude the quartz ones:
 introspection_files = \
     $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
-    $(gtk_base_c_sources) \
+    $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
+    $(gtk_base_c_sources)) \
     gtkprintoperation-unix.c \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
+# And include the regular ones:
+if USE_QUARTZ
+introspection_files += \
+    gtkclipboard.c \
+    gtkdnd.c
+endif
+
 if USE_X11
 introspection_files += \
     gtksocket.c \